*/
#include "gtkactionhelperprivate.h"
-#include "gtkactionobservable.h"
+#include "gtkactionobservableprivate.h"
#include "gtkwidgetprivate.h"
#include "gtkdebug.h"
#include "gtkactionmuxerprivate.h"
-#include "gtkactionobservable.h"
-#include "gtkactionobserver.h"
+#include "gtkactionobservableprivate.h"
+#include "gtkactionobserverprivate.h"
#include "gtkintl.h"
#include "gtkmarshalers.h"
#include "config.h"
-#include "gtkactionobservable.h"
+#include "gtkactionobservableprivate.h"
G_DEFINE_INTERFACE (GtkActionObservable, gtk_action_observable, G_TYPE_OBJECT)
+++ /dev/null
-/*
- * Copyright © 2011 Canonical Limited
- *
- * This library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_ACTION_OBSERVABLE_H__
-#define __GTK_ACTION_OBSERVABLE_H__
-
-#include "gtkactionobserver.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ACTION_OBSERVABLE (gtk_action_observable_get_type ())
-#define GTK_ACTION_OBSERVABLE(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
- GTK_TYPE_ACTION_OBSERVABLE, GtkActionObservable))
-#define GTK_IS_ACTION_OBSERVABLE(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
- GTK_TYPE_ACTION_OBSERVABLE))
-#define GTK_ACTION_OBSERVABLE_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), \
- GTK_TYPE_ACTION_OBSERVABLE, \
- GtkActionObservableInterface))
-
-typedef struct _GtkActionObservableInterface GtkActionObservableInterface;
-
-struct _GtkActionObservableInterface
-{
- GTypeInterface g_iface;
-
- void (* register_observer) (GtkActionObservable *observable,
- const gchar *action_name,
- GtkActionObserver *observer);
- void (* unregister_observer) (GtkActionObservable *observable,
- const gchar *action_name,
- GtkActionObserver *observer);
-};
-
-GType gtk_action_observable_get_type (void);
-void gtk_action_observable_register_observer (GtkActionObservable *observable,
- const gchar *action_name,
- GtkActionObserver *observer);
-void gtk_action_observable_unregister_observer (GtkActionObservable *observable,
- const gchar *action_name,
- GtkActionObserver *observer);
-
-G_END_DECLS
-
-#endif /* __GTK_ACTION_OBSERVABLE_H__ */
--- /dev/null
+/*
+ * Copyright © 2011 Canonical Limited
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * licence or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#ifndef __GTK_ACTION_OBSERVABLE_PRIVATE_H__
+#define __GTK_ACTION_OBSERVABLE_PRIVATE_H__
+
+#include "gtkactionobserverprivate.h"
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_ACTION_OBSERVABLE (gtk_action_observable_get_type ())
+#define GTK_ACTION_OBSERVABLE(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
+ GTK_TYPE_ACTION_OBSERVABLE, GtkActionObservable))
+#define GTK_IS_ACTION_OBSERVABLE(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
+ GTK_TYPE_ACTION_OBSERVABLE))
+#define GTK_ACTION_OBSERVABLE_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), \
+ GTK_TYPE_ACTION_OBSERVABLE, \
+ GtkActionObservableInterface))
+
+typedef struct _GtkActionObservableInterface GtkActionObservableInterface;
+
+struct _GtkActionObservableInterface
+{
+ GTypeInterface g_iface;
+
+ void (* register_observer) (GtkActionObservable *observable,
+ const gchar *action_name,
+ GtkActionObserver *observer);
+ void (* unregister_observer) (GtkActionObservable *observable,
+ const gchar *action_name,
+ GtkActionObserver *observer);
+};
+
+GType gtk_action_observable_get_type (void);
+void gtk_action_observable_register_observer (GtkActionObservable *observable,
+ const gchar *action_name,
+ GtkActionObserver *observer);
+void gtk_action_observable_unregister_observer (GtkActionObservable *observable,
+ const gchar *action_name,
+ GtkActionObserver *observer);
+
+G_END_DECLS
+
+#endif /* __GTK_ACTION_OBSERVABLE_PRIVATE_H__ */
#include "config.h"
-#include "gtkactionobserver.h"
+#include "gtkactionobserverprivate.h"
G_DEFINE_INTERFACE (GtkActionObserver, gtk_action_observer, G_TYPE_OBJECT)
+++ /dev/null
-/*
- * Copyright © 2011 Canonical Limited
- *
- * This library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_ACTION_OBSERVER_H__
-#define __GTK_ACTION_OBSERVER_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ACTION_OBSERVER (gtk_action_observer_get_type ())
-#define GTK_ACTION_OBSERVER(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
- GTK_TYPE_ACTION_OBSERVER, GtkActionObserver))
-#define GTK_IS_ACTION_OBSERVER(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
- GTK_TYPE_ACTION_OBSERVER))
-#define GTK_ACTION_OBSERVER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), \
- GTK_TYPE_ACTION_OBSERVER, GtkActionObserverInterface))
-
-typedef struct _GtkActionObserverInterface GtkActionObserverInterface;
-typedef struct _GtkActionObservable GtkActionObservable;
-typedef struct _GtkActionObserver GtkActionObserver;
-
-struct _GtkActionObserverInterface
-{
- GTypeInterface g_iface;
-
- void (* action_added) (GtkActionObserver *observer,
- GtkActionObservable *observable,
- const gchar *action_name,
- const GVariantType *parameter_type,
- gboolean enabled,
- GVariant *state);
- void (* action_enabled_changed) (GtkActionObserver *observer,
- GtkActionObservable *observable,
- const gchar *action_name,
- gboolean enabled);
- void (* action_state_changed) (GtkActionObserver *observer,
- GtkActionObservable *observable,
- const gchar *action_name,
- GVariant *state);
- void (* action_removed) (GtkActionObserver *observer,
- GtkActionObservable *observable,
- const gchar *action_name);
- void (* primary_accel_changed) (GtkActionObserver *observer,
- GtkActionObservable *observable,
- const gchar *action_name,
- const gchar *action_and_target);
-};
-
-GType gtk_action_observer_get_type (void);
-void gtk_action_observer_action_added (GtkActionObserver *observer,
- GtkActionObservable *observable,
- const gchar *action_name,
- const GVariantType *parameter_type,
- gboolean enabled,
- GVariant *state);
-void gtk_action_observer_action_enabled_changed (GtkActionObserver *observer,
- GtkActionObservable *observable,
- const gchar *action_name,
- gboolean enabled);
-void gtk_action_observer_action_state_changed (GtkActionObserver *observer,
- GtkActionObservable *observable,
- const gchar *action_name,
- GVariant *state);
-void gtk_action_observer_action_removed (GtkActionObserver *observer,
- GtkActionObservable *observable,
- const gchar *action_name);
-void gtk_action_observer_primary_accel_changed (GtkActionObserver *observer,
- GtkActionObservable *observable,
- const gchar *action_name,
- const gchar *action_and_target);
-
-G_END_DECLS
-
-#endif /* __GTK_ACTION_OBSERVER_H__ */
--- /dev/null
+/*
+ * Copyright © 2011 Canonical Limited
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * licence or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#ifndef __GTK_ACTION_OBSERVER_PRIVATE_H__
+#define __GTK_ACTION_OBSERVER_PRIVATE_H__
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_ACTION_OBSERVER (gtk_action_observer_get_type ())
+#define GTK_ACTION_OBSERVER(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
+ GTK_TYPE_ACTION_OBSERVER, GtkActionObserver))
+#define GTK_IS_ACTION_OBSERVER(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
+ GTK_TYPE_ACTION_OBSERVER))
+#define GTK_ACTION_OBSERVER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), \
+ GTK_TYPE_ACTION_OBSERVER, GtkActionObserverInterface))
+
+typedef struct _GtkActionObserverInterface GtkActionObserverInterface;
+typedef struct _GtkActionObservable GtkActionObservable;
+typedef struct _GtkActionObserver GtkActionObserver;
+
+struct _GtkActionObserverInterface
+{
+ GTypeInterface g_iface;
+
+ void (* action_added) (GtkActionObserver *observer,
+ GtkActionObservable *observable,
+ const gchar *action_name,
+ const GVariantType *parameter_type,
+ gboolean enabled,
+ GVariant *state);
+ void (* action_enabled_changed) (GtkActionObserver *observer,
+ GtkActionObservable *observable,
+ const gchar *action_name,
+ gboolean enabled);
+ void (* action_state_changed) (GtkActionObserver *observer,
+ GtkActionObservable *observable,
+ const gchar *action_name,
+ GVariant *state);
+ void (* action_removed) (GtkActionObserver *observer,
+ GtkActionObservable *observable,
+ const gchar *action_name);
+ void (* primary_accel_changed) (GtkActionObserver *observer,
+ GtkActionObservable *observable,
+ const gchar *action_name,
+ const gchar *action_and_target);
+};
+
+GType gtk_action_observer_get_type (void);
+void gtk_action_observer_action_added (GtkActionObserver *observer,
+ GtkActionObservable *observable,
+ const gchar *action_name,
+ const GVariantType *parameter_type,
+ gboolean enabled,
+ GVariant *state);
+void gtk_action_observer_action_enabled_changed (GtkActionObserver *observer,
+ GtkActionObservable *observable,
+ const gchar *action_name,
+ gboolean enabled);
+void gtk_action_observer_action_state_changed (GtkActionObserver *observer,
+ GtkActionObservable *observable,
+ const gchar *action_name,
+ GVariant *state);
+void gtk_action_observer_action_removed (GtkActionObserver *observer,
+ GtkActionObservable *observable,
+ const gchar *action_name);
+void gtk_action_observer_primary_accel_changed (GtkActionObserver *observer,
+ GtkActionObservable *observable,
+ const gchar *action_name,
+ const gchar *action_and_target);
+
+G_END_DECLS
+
+#endif /* __GTK_ACTION_OBSERVER_PRIVATE_H__ */
#include "config.h"
#include "gtkapplicationprivate.h"
-#include "gtkmenutracker.h"
+#include "gtkmenutrackerprivate.h"
#include "gtkicontheme.h"
#include "gtktoolbarprivate.h"
#include "gtkquartz.h"
#include "config.h"
-#include "gtkmenusectionbox.h"
+#include "gtkmenusectionboxprivate.h"
#include "gtkwidgetprivate.h"
#include "gtklabel.h"
-#include "gtkmenutracker.h"
+#include "gtkmenutrackerprivate.h"
#include "gtkmodelbutton.h"
#include "gtkseparator.h"
#include "gtksizegroup.h"
+++ /dev/null
-/*
- * Copyright © 2014 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_MENU_SECTION_BOX_H__
-#define __GTK_MENU_SECTION_BOX_H__
-
-#include <gtk/gtkmenutrackeritem.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkpopovermenu.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_MENU_SECTION_BOX (gtk_menu_section_box_get_type ())
-#define GTK_MENU_SECTION_BOX(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
- GTK_TYPE_MENU_SECTION_BOX, GtkMenuSectionBox))
-#define GTK_MENU_SECTION_BOX_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), \
- GTK_TYPE_MENU_SECTION_BOX, GtkMenuSectionBoxClass))
-#define GTK_IS_MENU_SECTION_BOX(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
- GTK_TYPE_MENU_SECTION_BOX))
-#define GTK_IS_MENU_SECTION_BOX_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), \
- GTK_TYPE_MENU_SECTION_BOX))
-#define GTK_MENU_SECTION_BOX_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), \
- GTK_TYPE_MENU_SECTION_BOX, GtkMenuSectionBoxClass))
-
-typedef struct _GtkMenuSectionBox GtkMenuSectionBox;
-
-GType gtk_menu_section_box_get_type (void) G_GNUC_CONST;
-void gtk_menu_section_box_new_toplevel (GtkPopoverMenu *popover,
- GMenuModel *model);
-
-G_END_DECLS
-
-#endif /* __GTK_MENU_SECTION_BOX_H__ */
--- /dev/null
+/*
+ * Copyright © 2014 Codethink Limited
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the licence, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#ifndef __GTK_MENU_SECTION_BOX_PRIVATE_H__
+#define __GTK_MENU_SECTION_BOX_PRIVATE_H__
+
+#include <gtk/gtkmenutrackeritemprivate.h>
+#include <gtk/gtkbox.h>
+#include <gtk/gtkpopovermenu.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_MENU_SECTION_BOX (gtk_menu_section_box_get_type ())
+#define GTK_MENU_SECTION_BOX(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
+ GTK_TYPE_MENU_SECTION_BOX, GtkMenuSectionBox))
+#define GTK_MENU_SECTION_BOX_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), \
+ GTK_TYPE_MENU_SECTION_BOX, GtkMenuSectionBoxClass))
+#define GTK_IS_MENU_SECTION_BOX(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
+ GTK_TYPE_MENU_SECTION_BOX))
+#define GTK_IS_MENU_SECTION_BOX_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), \
+ GTK_TYPE_MENU_SECTION_BOX))
+#define GTK_MENU_SECTION_BOX_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), \
+ GTK_TYPE_MENU_SECTION_BOX, GtkMenuSectionBoxClass))
+
+typedef struct _GtkMenuSectionBox GtkMenuSectionBox;
+
+GType gtk_menu_section_box_get_type (void) G_GNUC_CONST;
+void gtk_menu_section_box_new_toplevel (GtkPopoverMenu *popover,
+ GMenuModel *model);
+
+G_END_DECLS
+
+#endif /* __GTK_MENU_SECTION_BOX_PRIVATE_H__ */
#include "gtkmenubarprivate.h"
#include "gtkmenuitemprivate.h"
#include "gtkmnemonichash.h"
-#include "gtkmodelmenuitem.h"
+#include "gtkmodelmenuitemprivate.h"
#include "gtkprivate.h"
#include "gtkseparatormenuitem.h"
#include "gtktypebuiltins.h"
#include <gtk/gtkmenushell.h>
#include <gtk/gtkmnemonichash.h>
#include <gtk/gtkkeyhash.h>
-#include <gtk/gtkmenutracker.h>
+#include <gtk/gtkmenutrackerprivate.h>
#include <gtk/gtkeventcontroller.h>
G_BEGIN_DECLS
#include "config.h"
-#include "gtkmenutracker.h"
+#include "gtkmenutrackerprivate.h"
/*< private >
* SECTION:gtkmenutracker
+++ /dev/null
-/*
- * Copyright © 2013 Canonical Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_MENU_TRACKER_H__
-#define __GTK_MENU_TRACKER_H__
-
-#include "gtkmenutrackeritem.h"
-
-typedef struct _GtkMenuTracker GtkMenuTracker;
-
-typedef void (* GtkMenuTrackerInsertFunc) (GtkMenuTrackerItem *item,
- gint position,
- gpointer user_data);
-
-typedef void (* GtkMenuTrackerRemoveFunc) (gint position,
- gpointer user_data);
-
-
-GtkMenuTracker * gtk_menu_tracker_new (GtkActionObservable *observer,
- GMenuModel *model,
- gboolean with_separators,
- gboolean merge_sections,
- gboolean mac_os_mode,
- const gchar *action_namespace,
- GtkMenuTrackerInsertFunc insert_func,
- GtkMenuTrackerRemoveFunc remove_func,
- gpointer user_data);
-
-GtkMenuTracker * gtk_menu_tracker_new_for_item_link (GtkMenuTrackerItem *item,
- const gchar *link_name,
- gboolean merge_sections,
- gboolean mac_os_mode,
- GtkMenuTrackerInsertFunc insert_func,
- GtkMenuTrackerRemoveFunc remove_func,
- gpointer user_data);
-
-void gtk_menu_tracker_free (GtkMenuTracker *tracker);
-
-#endif /* __GTK_MENU_TRACKER_H__ */
#include "config.h"
-#include "gtkmenutrackeritem.h"
+#include "gtkmenutrackeritemprivate.h"
#include "gtkactionmuxerprivate.h"
#include "gtkdebug.h"
#include "gtkintl.h"
+++ /dev/null
-/*
- * Copyright © 2011, 2013 Canonical Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_MENU_TRACKER_ITEM_H__
-#define __GTK_MENU_TRACKER_ITEM_H__
-
-#include "gtkactionobservable.h"
-
-#define GTK_TYPE_MENU_TRACKER_ITEM (gtk_menu_tracker_item_get_type ())
-#define GTK_MENU_TRACKER_ITEM(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
- GTK_TYPE_MENU_TRACKER_ITEM, GtkMenuTrackerItem))
-#define GTK_IS_MENU_TRACKER_ITEM(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
- GTK_TYPE_MENU_TRACKER_ITEM))
-
-typedef struct _GtkMenuTrackerItem GtkMenuTrackerItem;
-
-#define GTK_TYPE_MENU_TRACKER_ITEM_ROLE (gtk_menu_tracker_item_role_get_type ())
-
-typedef enum {
- GTK_MENU_TRACKER_ITEM_ROLE_NORMAL,
- GTK_MENU_TRACKER_ITEM_ROLE_CHECK,
- GTK_MENU_TRACKER_ITEM_ROLE_RADIO,
-} GtkMenuTrackerItemRole;
-
-GType gtk_menu_tracker_item_get_type (void) G_GNUC_CONST;
-
-GType gtk_menu_tracker_item_role_get_type (void) G_GNUC_CONST;
-
-GtkMenuTrackerItem * _gtk_menu_tracker_item_new (GtkActionObservable *observable,
- GMenuModel *model,
- gint item_index,
- gboolean mac_os_mode,
- const gchar *action_namespace,
- gboolean is_separator);
-
-const gchar * gtk_menu_tracker_item_get_special (GtkMenuTrackerItem *self);
-
-const gchar * gtk_menu_tracker_item_get_display_hint (GtkMenuTrackerItem *self);
-
-const gchar * gtk_menu_tracker_item_get_text_direction (GtkMenuTrackerItem *self);
-
-GtkActionObservable * _gtk_menu_tracker_item_get_observable (GtkMenuTrackerItem *self);
-
-gboolean gtk_menu_tracker_item_get_is_separator (GtkMenuTrackerItem *self);
-
-gboolean gtk_menu_tracker_item_get_has_link (GtkMenuTrackerItem *self,
- const gchar *link_name);
-
-const gchar * gtk_menu_tracker_item_get_label (GtkMenuTrackerItem *self);
-
-GIcon * gtk_menu_tracker_item_get_icon (GtkMenuTrackerItem *self);
-
-GIcon * gtk_menu_tracker_item_get_verb_icon (GtkMenuTrackerItem *self);
-
-gboolean gtk_menu_tracker_item_get_sensitive (GtkMenuTrackerItem *self);
-
-GtkMenuTrackerItemRole gtk_menu_tracker_item_get_role (GtkMenuTrackerItem *self);
-
-gboolean gtk_menu_tracker_item_get_toggled (GtkMenuTrackerItem *self);
-
-const gchar * gtk_menu_tracker_item_get_accel (GtkMenuTrackerItem *self);
-
-GMenuModel * _gtk_menu_tracker_item_get_link (GtkMenuTrackerItem *self,
- const gchar *link_name);
-
-gchar * _gtk_menu_tracker_item_get_link_namespace (GtkMenuTrackerItem *self);
-
-gboolean gtk_menu_tracker_item_may_disappear (GtkMenuTrackerItem *self);
-
-gboolean gtk_menu_tracker_item_get_is_visible (GtkMenuTrackerItem *self);
-
-gboolean gtk_menu_tracker_item_get_should_request_show (GtkMenuTrackerItem *self);
-
-void gtk_menu_tracker_item_activated (GtkMenuTrackerItem *self);
-
-void gtk_menu_tracker_item_request_submenu_shown (GtkMenuTrackerItem *self,
- gboolean shown);
-
-gboolean gtk_menu_tracker_item_get_submenu_shown (GtkMenuTrackerItem *self);
-
-#endif
--- /dev/null
+/*
+ * Copyright © 2011, 2013 Canonical Limited
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the licence, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#ifndef __GTK_MENU_TRACKER_ITEM_PRIVATE_H__
+#define __GTK_MENU_TRACKER_ITEM_PRIVATE_H__
+
+#include "gtkactionobservableprivate.h"
+
+#define GTK_TYPE_MENU_TRACKER_ITEM (gtk_menu_tracker_item_get_type ())
+#define GTK_MENU_TRACKER_ITEM(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
+ GTK_TYPE_MENU_TRACKER_ITEM, GtkMenuTrackerItem))
+#define GTK_IS_MENU_TRACKER_ITEM(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
+ GTK_TYPE_MENU_TRACKER_ITEM))
+
+typedef struct _GtkMenuTrackerItem GtkMenuTrackerItem;
+
+#define GTK_TYPE_MENU_TRACKER_ITEM_ROLE (gtk_menu_tracker_item_role_get_type ())
+
+typedef enum {
+ GTK_MENU_TRACKER_ITEM_ROLE_NORMAL,
+ GTK_MENU_TRACKER_ITEM_ROLE_CHECK,
+ GTK_MENU_TRACKER_ITEM_ROLE_RADIO,
+} GtkMenuTrackerItemRole;
+
+GType gtk_menu_tracker_item_get_type (void) G_GNUC_CONST;
+
+GType gtk_menu_tracker_item_role_get_type (void) G_GNUC_CONST;
+
+GtkMenuTrackerItem * _gtk_menu_tracker_item_new (GtkActionObservable *observable,
+ GMenuModel *model,
+ gint item_index,
+ gboolean mac_os_mode,
+ const gchar *action_namespace,
+ gboolean is_separator);
+
+const gchar * gtk_menu_tracker_item_get_special (GtkMenuTrackerItem *self);
+
+const gchar * gtk_menu_tracker_item_get_display_hint (GtkMenuTrackerItem *self);
+
+const gchar * gtk_menu_tracker_item_get_text_direction (GtkMenuTrackerItem *self);
+
+GtkActionObservable * _gtk_menu_tracker_item_get_observable (GtkMenuTrackerItem *self);
+
+gboolean gtk_menu_tracker_item_get_is_separator (GtkMenuTrackerItem *self);
+
+gboolean gtk_menu_tracker_item_get_has_link (GtkMenuTrackerItem *self,
+ const gchar *link_name);
+
+const gchar * gtk_menu_tracker_item_get_label (GtkMenuTrackerItem *self);
+
+GIcon * gtk_menu_tracker_item_get_icon (GtkMenuTrackerItem *self);
+
+GIcon * gtk_menu_tracker_item_get_verb_icon (GtkMenuTrackerItem *self);
+
+gboolean gtk_menu_tracker_item_get_sensitive (GtkMenuTrackerItem *self);
+
+GtkMenuTrackerItemRole gtk_menu_tracker_item_get_role (GtkMenuTrackerItem *self);
+
+gboolean gtk_menu_tracker_item_get_toggled (GtkMenuTrackerItem *self);
+
+const gchar * gtk_menu_tracker_item_get_accel (GtkMenuTrackerItem *self);
+
+GMenuModel * _gtk_menu_tracker_item_get_link (GtkMenuTrackerItem *self,
+ const gchar *link_name);
+
+gchar * _gtk_menu_tracker_item_get_link_namespace (GtkMenuTrackerItem *self);
+
+gboolean gtk_menu_tracker_item_may_disappear (GtkMenuTrackerItem *self);
+
+gboolean gtk_menu_tracker_item_get_is_visible (GtkMenuTrackerItem *self);
+
+gboolean gtk_menu_tracker_item_get_should_request_show (GtkMenuTrackerItem *self);
+
+void gtk_menu_tracker_item_activated (GtkMenuTrackerItem *self);
+
+void gtk_menu_tracker_item_request_submenu_shown (GtkMenuTrackerItem *self,
+ gboolean shown);
+
+gboolean gtk_menu_tracker_item_get_submenu_shown (GtkMenuTrackerItem *self);
+
+#endif
--- /dev/null
+/*
+ * Copyright © 2013 Canonical Limited
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the licence, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#ifndef __GTK_MENU_TRACKER_PRIVATE_H__
+#define __GTK_MENU_TRACKER_PRIVATE_H__
+
+#include "gtkmenutrackeritemprivate.h"
+
+typedef struct _GtkMenuTracker GtkMenuTracker;
+
+typedef void (* GtkMenuTrackerInsertFunc) (GtkMenuTrackerItem *item,
+ gint position,
+ gpointer user_data);
+
+typedef void (* GtkMenuTrackerRemoveFunc) (gint position,
+ gpointer user_data);
+
+
+GtkMenuTracker * gtk_menu_tracker_new (GtkActionObservable *observer,
+ GMenuModel *model,
+ gboolean with_separators,
+ gboolean merge_sections,
+ gboolean mac_os_mode,
+ const gchar *action_namespace,
+ GtkMenuTrackerInsertFunc insert_func,
+ GtkMenuTrackerRemoveFunc remove_func,
+ gpointer user_data);
+
+GtkMenuTracker * gtk_menu_tracker_new_for_item_link (GtkMenuTrackerItem *item,
+ const gchar *link_name,
+ gboolean merge_sections,
+ gboolean mac_os_mode,
+ GtkMenuTrackerInsertFunc insert_func,
+ GtkMenuTrackerRemoveFunc remove_func,
+ gpointer user_data);
+
+void gtk_menu_tracker_free (GtkMenuTracker *tracker);
+
+#endif /* __GTK_MENU_TRACKER_PRIVATE_H__ */
#include "gtkbutton.h"
#include "gtkbuttonprivate.h"
#include "gtkwidgetprivate.h"
-#include "gtkmenutrackeritem.h"
+#include "gtkmenutrackeritemprivate.h"
#include "gtkimage.h"
#include "gtklabel.h"
#include "gtkbox.h"
#include "config.h"
-#include "gtkmodelmenuitem.h"
+#include "gtkmodelmenuitemprivate.h"
#include "gtkaccellabel.h"
#include "gtklabel.h"
+++ /dev/null
-/*
- * Copyright © 2011 Canonical Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_MODEL_MENU_ITEM_H__
-#define __GTK_MODEL_MENU_ITEM_H__
-
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkmenutrackeritem.h>
-
-#define GTK_TYPE_MODEL_MENU_ITEM (gtk_model_menu_item_get_type ())
-#define GTK_MODEL_MENU_ITEM(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
- GTK_TYPE_MODEL_MENU_ITEM, GtkModelMenuItem))
-#define GTK_IS_MODEL_MENU_ITEM(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
- GTK_TYPE_MODEL_MENU_ITEM))
-
-typedef struct _GtkModelMenuItem GtkModelMenuItem;
-
-G_GNUC_INTERNAL
-GType gtk_model_menu_item_get_type (void) G_GNUC_CONST;
-
-G_GNUC_INTERNAL
-GtkWidget * gtk_model_menu_item_new (void);
-
-#endif /* __GTK_MODEL_MENU_ITEM_H__ */
--- /dev/null
+/*
+ * Copyright © 2011 Canonical Limited
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the licence, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#ifndef __GTK_MODEL_MENU_ITEM_PRIVATE_H__
+#define __GTK_MODEL_MENU_ITEM_PRIVATE_H__
+
+#include <gtk/gtkcheckmenuitem.h>
+#include <gtk/gtkmenutrackeritemprivate.h>
+
+#define GTK_TYPE_MODEL_MENU_ITEM (gtk_model_menu_item_get_type ())
+#define GTK_MODEL_MENU_ITEM(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
+ GTK_TYPE_MODEL_MENU_ITEM, GtkModelMenuItem))
+#define GTK_IS_MODEL_MENU_ITEM(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
+ GTK_TYPE_MODEL_MENU_ITEM))
+
+typedef struct _GtkModelMenuItem GtkModelMenuItem;
+
+G_GNUC_INTERNAL
+GType gtk_model_menu_item_get_type (void) G_GNUC_CONST;
+
+G_GNUC_INTERNAL
+GtkWidget * gtk_model_menu_item_new (void);
+
+#endif /* __GTK_MODEL_MENU_ITEM_PRIVATE_H__ */
#include "gtkprivate.h"
#include "gtkmain.h"
#include "gtkstack.h"
-#include "gtkmenusectionbox.h"
+#include "gtkmenusectionboxprivate.h"
#include "gdk/gdkeventsprivate.h"
#include "gtkpointerfocusprivate.h"
#include "gtkcssnodeprivate.h"
#include "gtkstack.h"
#include "gtkstylecontext.h"
#include "gtkintl.h"
-#include "gtkmenusectionbox.h"
+#include "gtkmenusectionboxprivate.h"
#include "gtkmenubutton.h"
#include "gtkactionmuxerprivate.h"
-#include "gtkmenutracker.h"
+#include "gtkmenutrackerprivate.h"
#include "gtkpopoverprivate.h"
#include "gtkwidgetprivate.h"
#include "gtkeventcontrollerkey.h"
#include "gtkeventcontrollerkey.h"
#include "gtkeventcontrollermotion.h"
#include "gtkactionmuxerprivate.h"
-#include "gtkmenutracker.h"
+#include "gtkmenutrackerprivate.h"
#include "gtkwidgetprivate.h"
#include "gtkmain.h"
#include "gtknative.h"